From 8c9970bdb4df36f9483c3b90a403c14284097776 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 16 Feb 2006 16:31:52 +0100 Subject: [PATCH] Clean up swiotlb_init() decls. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c | 3 --- linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c | 4 ---- linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c index 8986ab8dfb..e493e345c5 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c @@ -27,11 +27,8 @@ #include #include -#if defined(CONFIG_SWIOTLB) -extern void swiotlb_init(void); int swiotlb; EXPORT_SYMBOL(swiotlb); -#endif #define OFFSET(val,align) ((unsigned long)((val) & ( (align) - 1))) diff --git a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c index b1f96da92c..0d09c4edbf 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c @@ -58,10 +58,6 @@ EXPORT_SYMBOL(dma_ops); extern unsigned long *contiguous_bitmap; -#if defined(CONFIG_SWIOTLB) -extern void swiotlb_init(void); -#endif - static unsigned long dma_reserve __initdata; DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h index b38e56f1f5..74a0c21bbe 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h @@ -32,6 +32,7 @@ extern dma_addr_t swiotlb_map_page(struct device *hwdev, struct page *page, extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address, size_t size, enum dma_data_direction direction); extern int swiotlb_dma_supported(struct device *hwdev, u64 mask); +extern void swiotlb_init(void); #ifdef CONFIG_SWIOTLB extern int swiotlb; -- 2.30.2